d920425c85d9e73512101c3549e9ec0560ecb840,src/org/opencms/workplace/editors/ade/CmsADEServer.java,CmsADEServer,getFavoriteList,#JSONObject#Collection#,881

Before Change


                String id = element.getClientId();
                if ((resElements != null) && !resElements.has(id)) {
                    try {
                        resElements.put(id, elemUtil.getElementData(element, types));
                        m_sessionCache.setCacheContainerElement(element.getClientId(), element);
                        result.put(id);
                    } catch (Exception e) {

After Change


                String id = element.getClientId();
                if ((resElements != null) && !resElements.has(id)) {
                    try {
                        JSONObject elemData = elemUtil.getElementData(element, types);
                        resElements.put(id, elemData);
                        if (elemData.has(CmsElementUtil.JsonElement.SUBITEMS.getName())) {
                            // this container page should contain exactly one container
                            CmsResource elementRes = cms.readResource(element.getElementId());
                            CmsXmlSubContainer xmlSubContainer = CmsXmlSubContainerFactory.unmarshal(
                                cms,
                                elementRes,
                                getRequest());
                            CmsSubContainerBean subContainer = xmlSubContainer.getSubContainer(
                                cms,
                                cms.getRequestContext().getLocale());

                            // adding all sub-items to the elements data
                            for (CmsContainerElementBean subElement : subContainer.getElements()) {
                                String subId = subElement.getClientId();
                                if (!resElements.has(subId)) {
                                    JSONObject subItemData = elemUtil.getElementData(subElement, types);
                                    resElements.put(subId, subItemData);
                                    m_sessionCache.setCacheContainerElement(subId, subElement);
                                }
                            }